From 7da15067e79b1b555f2cbd004c76b0b2537d83ba Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Wed, 19 Mar 2014 14:01:45 -0700 Subject: [PATCH] Bugs? --- src/cargo/util/mod.rs | 7 ++++++- src/cargo/util/{process.rs => process_builder.rs} | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) rename src/cargo/util/{process.rs => process_builder.rs} (76%) diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs index 80fe812c8..2e840da0d 100644 --- a/src/cargo/util/mod.rs +++ b/src/cargo/util/mod.rs @@ -1 +1,6 @@ -pub mod process; +//pub use self::process_builder::process; +//mod process_builder; + +pub fn process(cmd: &str) -> &'static str { + "ohai" +} diff --git a/src/cargo/util/process.rs b/src/cargo/util/process_builder.rs similarity index 76% rename from src/cargo/util/process.rs rename to src/cargo/util/process_builder.rs index c62907ea3..b05359d58 100644 --- a/src/cargo/util/process.rs +++ b/src/cargo/util/process_builder.rs @@ -1,3 +1,4 @@ +use std; use std::os; use std::io::process::{Process,ProcessConfig,InheritFd}; @@ -9,7 +10,7 @@ pub struct ProcessBuilder { impl ProcessBuilder { fn args(mut self, arguments: &[~str]) -> ProcessBuilder { - self.args = arguments.clone(); + self.args = arguments.to_owned(); self } } @@ -20,6 +21,6 @@ pub fn process(cmd: &str) -> ProcessBuilder { fn get_curr_path() -> ~[~str] { os::getenv("PATH").map(|path| { - path.split(std::path::SEP).collect() - }).or(~[]) + path.split(std::path::SEP).map(|seg| seg.to_owned()).collect() + }).unwrap_or(~[]) } -- 2.30.2